change map initialization
Merge branch 'escape-upstream' into staging