Port #14598 over to hosted docs
Port 89d437dedac599e0edf2320a55629773f4be1423 over to hosted docs