Flow driver: auto-format fixes
Fixed formatting of flow driver
Merged master