Hr 284 QA and HR-322 fix