flow log v3.5

Replaces #1050