Update cpp-common
For code review