Merge branch 'macos-10.4' into release-3.20

Merge-request: !6426