Merge branch 'bug6216'

Axel Uhl commited 2026-03-07 18:27:30 +0100 commit 1886402c04e91793960db27adb49f70934b13f6d