cc7b9eb085
Backport #27954 by @6543 as title --- *Sponsored by Kithara Software GmbH* Co-authored-by: 6543 <m.huber@kithara.com>