Merge branch 'pr/658' into development

frdel committed Sep 25, 2025 at 10:03 UTC e3f938909ad500666a6914623ca79c6ca0d74da6

No changes.