Merge branch 'rt/doc-merge-file-diff3'