Improve Javascript
Merge branch 'release/v47'