Merge "Fixed bug in Data store where multiple readers could overwrite other augmentat...