Code

Merge branch 'js/add-e-submodule-fix' into maint