Merge branch 'caravel_user_project_analog' into main