Merge branch 'js/maint-cover-letter-non-ascii' into maint