Merge branch 'sb/submodule-module-list-fix' into maint