3nd Patch for PR78009