Merge branch 'cb/bisect-replay-with-dos-fix'