Code

Update for Trac Ticket #3181