am 59872bf3: Merge "Fix stream flushing when SYNC_FLUSH is set."

* commit '59872bf34f265388a69547330a3cc78c75564a64':
  Fix stream flushing when SYNC_FLUSH is set.