Port #14250 over to hosted docs