Merge branch 'master' into map_only
remove all but map
test
Merge branch 'map_only'