Implemented FORGE-1879
Merge pull request #473 from agoncal/FORGE-1879

Implemented FORGE-1879