Addition to Ticket #1483843