Merge branch 'map-api'
Remove members implemented only in master