some tuning
make sure to flush
Merge branch 'master' into test-env

* master:
  make sure to flush