Merge branch 'js/lsfix'