Merge "Change vFW payload from pg-streams to streams"