Backport of gh-29703, commit e050c37.

Comment From: simonbasle

Closed by 0851b0f