Cherry-pick to 5.21 ?

@bshah I'm pretty sure I already did it via git CLI, rather than an MR

Ah, all good, hint for future, use "git cherry-pick -x" so it adds reference to this commit ;)

will try to remember that