Implemented FORGE-863