Implemented FORGE-834