Take master cpp-common