Daniel Passos started work on Enhancement AGIOS-679