merged from trunk

[SVN r45842]
merged from trunk

[SVN r47983]
merged from trunk

[SVN r49439]
merged from trunk

[SVN r49607]