ENG-6897: Use flush

`flush` then `m_client.drain`?