Merge "Bug 509: Fixed incorrect merging of Data Store Writes / Events"