Doc updates from commit d1b5a2552a450621fb9dcac222366d881c898796