[PTFM-4820] dxcpp refactoring