Merge branch 'ab/darwin-default-to-sha1dc'