cpp_standalone from master