Merge "flow descriptors should be always stored when addFlow is called"