Merge branch 'QA_5_1' into QA_5_2