Merge branch '6495-client-language-as-required' into 'develop'

Setting the language as a required field when creating a client

Closes #6495

See merge request !1719