Implemented FORGE-807