--HR-356 changes related to replacement of text.
Merge pull request #649 from PoonamNalawade/HR356

--HR-356 changes related to replacement of text.