TGT-999: Task branch