Move to latest cpp-common