Merge branch 'pr/696' into development

frdel committed Aug 25, 2025 at 12:48 UTC 2282794a1aa6e61fee71d70e6ea678741337b84c

No changes.