Merge branch 'config/update-mongoose' into 'develop'