tracked in https://issues.jboss.org/browse/AGPUSH-508