Wave: Merging from trunk

[SVN r85641]
Wave: merging from trunk

[SVN r85646]