Fix typo
Merge remote-tracking branch 'origin/QA_3_5'