Merge pull request #8502 from MrPetovan/task/translation