Pipeline failures after !417

Many pipelines are failing after !417 (merged) was merged.

@karl-wette Can you take a look at this?