Move up to latest cpp-common