Merge branch 'pr/634' into development

frdel committed Aug 4, 2025 at 21:36 UTC 139d310883ef3e6ac949bc5a9137d7671bac768a

No changes.