Merge branch 'pr/636' into development

frdel committed Aug 1, 2025 at 12:23 UTC 60b37268ec9a782c2b27014e75572d44af70b33d

No changes.