Issue #3613402: Refactor code to be prepared for 2.x

Closes #3613402

Merge request reports

Loading