Merge branch 'js/early-config' into maint