[286983] Fix the discrepancy of the plugins and the streams that exists between 3.1.1 and 3.2 (part2)