Resolve #3614309 "Abandon decorator pattern"

Closes #3614309

Merge request reports

Loading