Merge "BUG-509: make sure datastore commits are visible"