Patch submitted for Ticket 12437