Use content language for text
Merge branch 'CE-405' into dev