Implemented FORGE-1254 and Unit Test

Signed-off-by: George Gastaldi <gegastaldi@gmail.com>