Translate
Fix typo
Merge commit '7f01d29'
Merge branch 'QA_4_0'