Test Trac #7536