Sync with new flush method
Merge branch 'avalon4' of https://github.com/Canaan-Creative/MM into avalon4