Merge "Enable specific bundles to be enabled/disabled" into main