merged with branch mongodb-deep