Update cpp-common to master