Test Trac #8616