Daniel Passos started work on Feature Request AGIOS-595