The original got PR got merged automatically, but seeing as tests still fail on this, we need an open one for discussion.