Resolve #3438832 "Fix remaining code"

Merge request reports

Loading