Merge branch 'atomic-writes'