changes from doc/doc commit 142039b1ef7c0571e2016bf420defc03bd00679a