This is a fix for issue #25394

Comment From: raderio

Any updates when this can be merged?

Comment From: snicoll

@dPechman42 apologizes for this, @jhoeller fixed the related issue in the meantime. Thanks for the PR, in any case!