Merge change Id856eca6

* changes:
  protect use of SMALL_BUFFERS and HANDSHAKE_CUTTHROUGH