Backport of gh-28232

Comment From: vritser

Can I PR this issue? and which branch to check out from?

Comment From: snicoll

@vritser thanks for the offer but this issue has already an assignee.