Fix mongo mapping error
Merge branch 'master' into PIM-2243