Merge with mintao/mongodbsuite