Merge branch 'hotfix-0.7.2' into next
make small change to mongodb to test resume feature
Merge branch 'next'