1092 es mapping

Bugs included in this pull request:

1092 (not including embedded_uuid_closure)
1058
1066
750

I will create 2 more pull requests for 805 and 442