more and more and more docs ... almost there
(cherry picked from commit 9a881c70cbcd95b26b6af9dac075384fa236f2c7)