[*][Migration upstream r62640] Merge branch 'svn_merge'