this was really just intended for master, no need to backport really.

I understand, but it was trivial. We'll have to maintain the other branches for a while, so it doesn't hurt keeping a bit of similarity when it's a no-brainer to do