Merge from trunk.  Fixes #9103



[SVN r86632]
Merge from trunk.  Fixes compile error in test.



[SVN r86633]