prevent data loss when collection_dump=False
Merge branch '2.0-dev' into config