v2, v3, integration branch

[SVN r62649]
merge trunk

[SVN r62809]