Bring in recent docs changes

* 25cafec4a9a6e50e4d35d9aee899b94540ef9dea
* ba78edbed8cc81d01ce5efc4d5a3f0acfbf19bcb