Merge branch 'ninja-intl-paths' into release-3.23

Merge-request: !7833