Take cpp-common at master