Merge "Improve beginMasterChanges and make methods for DeferredUpdates"