Port #14666 over to hosted docs