Merge branch 'cw/bisect-replay-with-dos'