Merge branch 'jk/completion-diff-submodule'