Merge branch 'cc/bisect-filter'