Merge branch 'master' into conformance-build