Merge branch 'master' into macos-ci-in-editable-mode