Merge remote-tracking branch 'upstream/QA_4_6' into QA_4_6