ENG-6897: Use flush