Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into next