Daniel Passos commented on Sub-task AGPUSH-605