Merge branch 'backport-3.24-file-install-macos' into release-3.25

Merge-request: !8293