Merge branch 'map' to integration