Port #13996 over to hosted docs