HR-394 Modification as per feedback
--HR-394 Modifications to default values
--HR-395 related tweaks
Merge pull request #704 from NileemaJadhav/HR-394-work

HR-394 Modification as per feedback