changes from doc/doc b7ab271c0d90f636