Merge "rework sfc flows 2"