Missed the commit for C++ code