AMGA-5 POST QA bug fixes and modifications