Merge branch 'js/add-not-submodule' into maint