Merge branch 'master' into develop
map bug fix
Merge branch 'develop'