Test Trac #8640