Backport #35271 by @TimB87 This is an attempt to fix #35230 as discussed in the ticket. Co-authored-by: Tim Biermann <tbier@posteo.de>
Backport #35271 by @TimB87 This is an attempt to fix #35230 as discussed in the ticket. Co-authored-by: Tim Biermann <tbier@posteo.de>