Merge branch 'update' into merge
Merge branch 'js' into merge