Issue #3613433: Refactor code to be ready with 2.x

David Galeanorequested to merge
issue/flowdrop_agents-3613433:3613433-roadmap-to-2.0.0 into 2.x

Closes #3613433

Merge request reports