Implemented FORGE-807
Implemented FORGE-805