Merge branch 'master' into 6587-switch-language-uses-self-name