Merge branch 'sz/submodule-force-update' into maint-1.7.11