Daniel Passos updated Sub-task AGPUSH-610