Merge pull request #3429 from PoonamNalawade/HR-368