upstream: fix after merging geth v1.16.7#15

allformless wants to merge 17 commits intodevelopallformless/bsc:developfrom

upstream-geth-v-1-16-7-fixallformless/bsc:upstream-geth-v-1-16-7-fixCopy head branch name to clipboard