Merge branch 'sb/submodule-diff-header-fix'