issue #22331: Move some residual objects from core to mfg. ext.