cherry pick from #664#665

liam-lai wants to merge 1 commit intomainnet-hot-fix-v2.2.0XinFinOrg/XDPoSChain:mainnet-hot-fix-v2.2.0from

mainnet-hot-fix-v2.2.0-cherry-pickXinFinOrg/XDPoSChain:mainnet-hot-fix-v2.2.0-cherry-pickCopy head branch name to clipboard