Ticket #1084 Research/Updates