--HR-359 Notice Fixes
--HR-359 tweak
Merge pull request #646 from PoonamNalawade/Hr-359

Hr 359