Merge branch 'nd/bisect-show-list-fix'