Issue #3610595: Refactor code to work with FlowDrop 2.0.x

David Galeanorequested to merge
issue/flowdrop_gin-3610595:3610595-refactor-code-to into 2.0.x

Closes #3610595

Merge request reports