merged extra_files changes into release_5.2.1 branch of doc/doc