Merge branch 'cc/maint-1.6.0-bisect-fix'