merged from trunk

[SVN r47983]
merged from trunk

[SVN r48605]
merged from trunk

[SVN r48781]
merged from trunk

[SVN r49439]
merged from trunk

[SVN r49607]