Merge pull request #31467 from ruchamahabal/hr-separation