Merge branch 'cmake-gui-locale' into release-3.22

Merge-request: !7303