Part fix for #6923 language not being set.
Merge branch 'release/2.11' into release/12.0