Merge "updates to use new doc toolchain"