Code review updates and pull in updated cpp-common