Merge branch 'main' into submodule-worktree-checkpoint-test