HR-273 QA changes
Merge pull request #409 from monishdeb/HR-273

HR-273 QA changes