Implemented FORGE-862