Port #14565 over to hosted docs