MongoDB recognition support
Add comment
Merge branch 'mongodb' into dev