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

Merge-request: !7303