Implementation for issue ERRAI-691

Link: https://issues.jboss.org/browse/ERRAI-691