Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7