Merge branch 'cc/bisect' into next