HR-273 and other fixes
Merge pull request #402 from monishdeb/HR-273-fix

HR-273 and other fixes