Merge "C/C++ adjustments and bug fixes." into oc-dev