Merge changes I1f4a2825,Ie8fe5e98,Ice304186

* changes:
  Rewrite some methods (3/n)
  Make #sendPendingStreaming a static method (2/n)
  Some code cleanup (1/n)