rc: bundles: consolidated rc a bit more