Merge from trunk.



[SVN r85097]
Merged from trunk.  Closes #8916



[SVN r85211]
Merge from trunk.  Fixes #9031


[SVN r85569]