Implemented FORGE-1635
Merge pull request #398 from agoncal/FORGE-1635

Implemented FORGE-1635