[Map] Dynamic update map

All testcases were passed.
Merge remote-tracking branch 'origin/master'