HR-261 QA phase 2 fix
HR-261 QA Phase2 template fix
Merge pull request #429 from monishdeb/HR-261-QA-fix

Hr 261 qa fix