* merge all revision from 25.03 branch that are not yet merged into trunk
Authored by: mortenmacfly 2025-03-31
Parent: [r13646]
Child: [r13648]