Merge branch 'cc/maint-bisect-paths' into maint