Merge branch 'jk/bisect-show-tree' into maint