Merge branch 'sb/submodule-short-status'