Merge branch 'rh/diff-orderfile-doc'