Merge branch 'fix-language-override' into 'master'

Fix language override

Closes #674 (closed)

See merge request !891 (merged)

(cherry picked from commit f62b93da)

bac49681 Fix language override