By the way with this I am probably resolving also:
https://issues.jboss.org/browse/ARQGRA-362

Is this my solution satisfactory ?