CORE-5832: more changes to get mixed pipelines to work