Merge branch 'cc/maint-bisect-paths'