Merge pull request #22723 from Anurag810/HR-fix