Resolve #3519530 "Refactor how the"

Closes #3519530

Merge request reports

Loading