Applied new task type.
(cherry picked from commit c15905d)