merge cpp-fix