merge from mapjs
merge from mapjs
merge from mapjs
use new batch shortcut, remove unused variables & functions
merge from mapjs
merge from mapjs