update and merge to latest jssdk