CORE-5832: more updates for mixed pipelines