Merge development into back-merge/DX-20927

Brings back-merge branch up to date with development so main can be back-merged cleanly (DX-20927).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: reeshika-h