Merge "Make DeferredUpdates able to run DataUpdates"