I first tried to do the usual cherry-pick based backport, but it basically yieled one giant conflict because of all the code style changes we applied on our side.

So I just copy-pasted the new core code into our file, ran our linters, and the resulting diff ended up looking almost perfectly like the Core diff from that commit. I just had some minor whitespaces or comment layout differences to fix. I must have missed that one, I will fix it. But note that this will make our code more different from the Core code, not less.