BRANCH 4.6: fixed faulty logic for handling return on queued trigger
BRANCH 4.6: fixed faulty logic for handling return on queued trigger

diegocortassa/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC,diegocortassa/TACTIC,Southpaw-TACTIC/TACTIC