Doc updates to match 598e64662d80ea51c60b2f64cd6d47c90421af6a.