Merge branch 'cc/bisect-skip'