Latest cpp-common merge