Merge "Defuse Bundles parsed by the system process." into nyc-dev