Translator G
Merge origin/master