Merge pull request #8759 from mook-as/macos/vz-default

Merge pull request #8759 from mook-as/macos/vz-default #2246