[PD-dev] C++ support