refactor: #3561704 Code update

By: grimreaper

Closes #3561704

Merge request reports

Loading