Port #15031 over to hosted docs