[release-v3.30] Auto pick #10084: Adjust flow generator implementation (#10105)