Abstract: A heat exchanger for a fluid having a vapor-phase and a liquid-phase is provided. The heat exchanger includes a first manifold, a second manifold, a plurality of parallel channels, a mixing device, and one or more baffles. The parallel channels are in fluid communication with the first and second manifolds. The mixing device mixes the fluid flowing into the first manifold so that the fluid is a substantially homogeneous two-phase mixture of the vapor and liquid phases. The baffles are within the first manifold and ensure that the fluid enters the parallel channels as the substantially homogeneous two-phase mixture.