4e310133f9
Backport #25675 by @delvh Regression of #25672. Co-authored-by: delvh <dev.lh@web.de>
Backport #25675 by @delvh Regression of #25672. Co-authored-by: delvh <dev.lh@web.de>