Merge branch 'backport-3.24-file-install-macos'