Merge "Fix NPE and enhance flows table"