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

Closes #3613433

Merge request reports

Loading