--HR-359 -notice fixes
Merge pull request #639 from PoonamNalawade/HR-359

--HR-359 -notice fixes