Moved the flow control stuffs back into Evoga
Authored by: tmy17 2016-06-10
Parent: [r1596]
Child: [r1598]