[soci/f16] Upstream integration New CMake build system