Merge branch 'record-replay'