Merge branch 'js/commit-by-name'