fix maps#new issue
Merge branch 'master' into css_refactoring