Merge branch 'cc/bisect' (early part)