Merge "Handle updates to C++ API." into klp-dev