This is a sibling of !656 (merged). Unfortunately that MR could not be automatically cherry-picked. 😦 So I had to do this by hand...