Wojciech Trocki The linked PR for this task is the same as the PR linked in https://issues.jboss.org/browse/AGIOS-653
Is that a typo, or does that PR address both tasks?