Hi,

this commit is a backport of 54f93e9 in order to fix the build pipeline on 2.2.x & 2.3.x

See gh-23433 See gh-21605

Cheers, Christoph

Comment From: philwebb

Thanks @dreis2211, I knew I'd miss something!