Merge branch 'th/doc-diff-submodule-option' into next