Speculative merge to check if !21835 (merged) caused symptoms in ATR-19550
Will WIP once pipeline is going
This reverts merge request !21835 (merged)