Daniel Passos updated Enhancement AGIOS-602