Draft: Resolve #3566633 "Refactor for 2.x"

Closes #3566633

Merge request reports

Loading