port #15395 over to hosted docs