Merge branch 'pr/1229' into development

frdel committed Mar 9, 2026 at 15:14 UTC ea8ee6d3f77baef25222ba57ad1d1ea65973aeba

No changes.