DM-1466 changes for new C++ design, Flux algorithms