Merge branch 'js/commit-format'