Merge branch 'develop'
Merge branch 'develop'
use automic boolean for flush synchronization
Merge branch 'master' into develop