Test Trac #8628