Merge "Datastore: lower in-memory change tracking overhead"