Implemented FORGE-805
Merge pull request #294 from gregsteel/FORGE-805

Implemented FORGE-805
Implemented FORGE-807