Merge.

[SVN r42905]
Merge.

[SVN r43063]
Merge.

[SVN r43162]