Update to latest swirl_flow behavior