further additions to the map hierarchy
Merge remote branch 'origin/multicore' into multicore