Merge branch 'js/fmt-patch' into next