**Cherry-pick to `6.1.x`** (cherry picked from commit 075613c4a1)
075613c4a1
backport-issue.yml
(cherry picked from commit 6d2bf330d1)
6d2bf330d1