Take latest cpp-common
Merge branch 'issue624' into dev