Implemented FORGE-1254 and Unit Test

See https://issues.jboss.org/browse/FORGE-1254