Merge pull request #1486 from wwbmmm/nshead_rpc_dump_and_replay