[No review required] Take master cpp-common