Daniel Passos updated Task AGIOS-640