Agpush 912

for https://issues.jboss.org/browse/AGPUSH-912