Merge branch 'jt/diff-lazy-fetch-submodule-fix'