cpp-common merge commit