Agpush 730

https://issues.jboss.org/browse/AGPUSH-730