HR-325 and additional fix
Merge pull request #517 from monishdeb/HR-327

HR-325 and additional fix