merged from trunk

[SVN r45230]
merged from trunk

[SVN r47991]
merged from trunk

[SVN r48028]
merged from trunk

[SVN r49439]
merged from trunk

[SVN r49607]