Add embed map response
Merge branch 'dev' into staging