Rebase. Add task behavior

Rebase. Fix order_task behavior