Merge main into PR 24

Co-authored-by: Cursor <cursoragent@cursor.com>