Merge branch 'pr/504' into development

frdel committed Jun 24, 2025 at 22:04 UTC 91da11a83e7b300ee14d220a2d37ef6cb72a227e

No changes.