Implemented FORGE-805