Next changes need to port: - https://github.com/ethereum/go-ethereum/pull/22842 - https://github.com/ethereum/go-ethereum/pull/21396