Merge branch 'ah/submodule-typofix-in-error' into maint