merge [84937] from trunk, fixes #8759

[SVN r85426]
Wave: Merging from trunk

[SVN r85641]
big merge from trunk

[SVN r85668]
big merge from trunk

[SVN r85669]
Merged 84441 to release

[SVN r86251]