Test Trac #8357