merged [85001], [85004], [85005], [85016], [85017], [85018], [85022], [85028], [85099] and [85100] from trunk

[SVN r85146]
merged [85175] from trunk

[SVN r85176]
merged [85497] from trunk

[SVN r85509]