merged [85208] from trunk

[SVN r85223]
merged [85209] from trunk

[SVN r85224]
merged [85225] from trunk

[SVN r85227]
merged [85226] from trunk

[SVN r85228]
merged [85302] from trunk

[SVN r85330]