Merge branch 'QA_5_2'