Forward port [tendermint/tendermint#7711](https://github.com/tendermint/tendermint/pull/7711) to [feature/pbts](https://github.com/cometbft/cometbft/tree/feature/pbts)