Modify Issue CB-2273.