embed this map
Merge branch 'bug/70663028' into dev