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