Merge pull request #2365 from XinFinOrg/dev-upgrade-v2.8.0-2

Merge from main branch and resolve conflict

Author: benjamin202410

.github/pull_request_template.md

@@ -21,7 +21,7 @@ _Put an `✅` in the boxes that apply_
 
 ## Impacted Components
 
-Which parts of the codebase do this PR touch?
+Which parts of the codebase does this PR touch?
 _Put an `✅` in the boxes that apply_
 
 - [ ] Consensus