HR-234 changes
Merge pull request #348 from monishdeb/HR-234

HR-234 changes