[TASK] Update to most recent Flow