* merge changes from trunk into the branch (direction trunk to branch)
Authored by: mortenmacfly 2025-03-02
Parent: [r13626]
Child: [r13628]