Merge "Bug-2098- sal-compatibility not get up-to-date flow information"