Merge branch 'tests/skip-some-tests-on-mac' into 'develop'