[OCaml] Commit missing parts of r210395