Forge-1201

Implemented https://issues.jboss.org/browse/FORGE-1201