Merge branch 'pr/1235' into development

frdel committed Mar 10, 2026 at 17:06 UTC 2b6e830dd66c2539862f860f6d74c8f108e8f473

No changes.