HR-314 reamining fix
HR-294 QA fix
HR-284 QA fix