Ticket 8790 Patch