[PATCH v2 00/13] Manage more flow related things from generic flow code