Avoid calling flush from lifecycle callbacks
Merge branch 'master' of github.com:flack/midgard-portable