--HR-357 feedback
Merge pull request #677 from divya-jose/HR-357_feedback

--HR-357 feedback