--HR-355 Tweaks
Merge pull request #674 from NileemaJadhav/HR-355-work

--HR-355 Tweaks