Resolve #3295357 "Feedback round 4"

Closes #3295357

Merge request reports

Loading