Test Trac #8540