Apply changes from 2.0.4 to fix default language