Merge branch 'cc/bisect'