Merge branch 'rj/bisect-already-used-branch'