Resolve #3550710 "Convert to oop"

Closes #3550710

Merge request reports

Loading