Try to land discovery wsapi in 772657
929243 should be a minimal patch