Port part of f9349f36dfbfda7bf755f458d856d45d07745f29 over to hosted docs
Port #13988 over to hosted docs