Merge branch 'kb/maint-submodule-savearg'