Fix language override Closes #674 See merge request !891 (cherry picked from commit f62b93da) bac49681 Fix language override