Changes related to flowtable generic implementation.