Merge "Add mergeable update support DeferredUpdates"