changes from doc/doc commit b43325496774fe5973729d931832b4f0de75f263