Merge branch 'sb/submodule-update-reset-fix' into maint