[*][Migration upstream r62590] Merge remote branch 'origin/upstream' into svn_merge