Merge branch 'jk/maint-fetch-submodule-check-fix' into maint