Merge branch 'c++-api'