Test Trac #8535