Merge branch 'jk/diff-submodule-diff-inline'