BS-2615, add support to subtasks