Implemented ERRAI-605

https://issues.jboss.org/browse/ERRAI-605

Implementation completed as proposed in the jira.