[rpc] Ref: https://github.com/tendermint/tendermint/issues/3076, https://github.com/tendermint/tendermint/issues/3813 Pick: https://github.com/tendermint/tendermint/pull/3851, https://github.com/tendermint/tendermint/pull/3825