Test Trac #7954