Merge latest C++ changes