Merge "Add options to specify payload size and use client/server pairs"