* merge trunk into branch for the release
Authored by: mortenmacfly 2025-03-29
Parent: [r13643]
Child: [r13645]