Merge branch 'js/alias-early-config' into maint