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

Closes #3610595

Merge request reports

Loading