Merge branch 'js/maint-all-implies-HEAD' into maint