flow log v3.4

Rebased #1037