issue #22341: Move a couple things out of core that are only applicable to manufacturing.