Merge branch 'doc-file-GENERATE-order' into release