Merge branch 'js/scalar'