Implemented FORGE-613
Merge pull request #257 from fribeiro1/FORGE-613

Implemented FORGE-613