Merge main

Co-Authored-By: Marshall <marshall@zed.dev>