Merge branch 'pr/840' into development

frdel committed Dec 15, 2025 at 14:44 UTC a390adaa3c93d000e0bb858ea4ac0d58fc739453

No changes.