Merge branch 'map-api'