A few map changes
Merge remote-tracking branch 'origin/master' into 3.1.4.8_Update