am 98ee7b8a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '98ee7b8a5eb2c89439d7cdab914cc7b3d862f8b0':
  TransferQueue: use a few extra buffers