Merge branch 'ad/bisect-cleanup'