Resolve #3561875 "Convert to oop"

Closes #3561875

Merge request reports

Loading