Resolve #3594373 "Convert to oop"

Closes #3594373

Merge request reports

Loading