HR-325 additional fixes
Merge pull request #522 from monishdeb/HR-327

HR-325 additional fixes