cpp-common update