merged from trunk

[SVN r46061]
merged from trunk

[SVN r49133]
merged from trunk

[SVN r49607]