New index that shows the embedded map.
Merge commit '08b872c6ba289cb214a85d6f75666bcfd089dd5e'