Case 19659. Added patch for DFP