Draft: Resolve #3576580 "Fix"

Closes #3576580

Merge request reports

Loading