[TASK] Update to latest Flow performance changes