Resolve #3558273 "General overhaul"

Closes #3558273

Merge request reports

Loading