Backport of gh-25001

Comment From: snicoll

Closed by 3c59c2a