Merge "Revert "Fix bug 171. EchoReply payload must be the same as the correspoding...