Update map related modules
Merge branch 'master' into development