Extra cpp-common update