Merge branch 'pr/595' into development

frdel committed Jul 21, 2025 at 19:58 UTC 542cd65463c14999725b3e73acfccbacde05caaf

No changes.