[node] Ref: https://github.com/tendermint/tendermint/issues/3716 Pick: https://github.com/tendermint/tendermint/pull/3740