Merge branch 'jm/branch-rename-nothing-error'