Merged stuff from Vg.
map changes
Merge remote-tracking branch 'origin/DNA' into bleeding-edge-freeze