Merge branch 'map' into integration