Rf 13301

These commits solve https://issues.jboss.org/browse/RF-13301 . 
Thank you