Hi,

this PR fixes #24458 and #24459 in one go. That's hopefully okay.

Cheers, Christoph

Comment From: snicoll

Yup, related enough to do those in a single commit. Thanks again!