Changes: #9128 was cherry-picked in the 4.09 branch
Changes: #9128 was cherry-picked in the 4.09 branch

gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml,gerdstolpmann/ocaml