Merge branch 'rr/maint-submodule-unknown-cmd' into maint