Code review mark-ups and take latest cpp-common