Port #14482 over to hosted docs
Port #14516 over to hosted docs