Issue #3613436: Refactor code to be ready for 2.x

Closes #3613436

Merge request reports

Loading