Merging with js2 mode changes for uStudio