flow log v2.6

Rebase of #984