Pull latest cpp-common in to sprout dev