Merge "Change defusing for lazy bundles"