merged from trunk

[SVN r45289]
merged from trunk

[SVN r47983]
merged from trunk

[SVN r49607]