Merge branch 'rr/submodule-diff-config'