Merge branch 'jn/submodule-core-worktree-revert'