FORGE-762 + FORGE-763