--HR-250 tweaks
Merge pull request #349 from PoonamNalawade/HR-250

--HR-250 tweaks