Merge branch 'fc/macos-x-clipped-write' into maint