Merge in upstream changes to hallc_replay