bf664c2e85
Backport #33304 The only conflict is caused by `templates/shared/issueicon.tmpl`
Backport #33304 The only conflict is caused by `templates/shared/issueicon.tmpl`