refactor: #3562021 Code update

By: grimreaper

Closes #3562021

Merge request reports

Loading