[No reviewer] Update cpp-common and change S comparison

Fixes #580