Merge branch 'js/sh-style'