merged from trunk

[SVN r46303]
merged from trunk

[SVN r47983]
merged from trunk

[SVN r48169]
merged from trunk

[SVN r49439]
merged from trunk

[SVN r49607]