Resolve #3341786 "Fix more issues"

Closes #3341786

Merge request reports

Loading