Fix lang switcher
Merge branch 'develop'