merged from trunk

[SVN r49439]
merged from trunk

[SVN r49607]