Merge "Bug 509: Added support for merge operation to InMemoryData Store"