Fix map message
Merge branch 'dev' into staging