Merge branch 'js/submodule-in-excluded' into maint