Merge branch 'js/misc-fixes' into maint