Merge pull request #4670 from vjpai/bbuf

Support generic (non-proto) performance testing