Merge branch 'QA_4_9' into QA_5_0