HR-394 Modification as per feedback
--HR-394 Modifications to default values