Merge branch 'dev'
translate updated
Merge branch 'hotfix-translate' into dev