Merge changes Ieca708fe,Ic1647135 into main

* changes:
  Fix doc typo.
  Fix C incompatibilities.