Merge branch 'js/reset-usage' into maint