changes from doc/doc commit c958b774bacbf7e44