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