Handle concurrent conflicts when committing.
Merge branch 'work' into datastore-cleanup