smarter delayed flush
Merge branch 'develop'