Merge branch 'js/fmt-patch'