Merge branch 'js/no-builtins-on-disk-option' into maint