Fixes some bugs in embeded maps
Merge branch 'master' into staging