fix en- android
Merge branch 'dev'