[master] map changes