Implemented FORGE-842