Implemented FORGE-613