More work on bug #8366.  I added by dept and by customer.