merge from mapjs, kinetic upgrade to 4.4