HR-314 fix and HR-293 improvement
Merge pull request #482 from monishdeb/HR-314

HR-314 fix and HR-293 improvement