Merge "Use transaction listener to run DeferredUpdates in CLI mode"