Merge pull request #3751 from motiondivision/worktree-fix-issue-3735