Merge "Add support for update_tasks"