svn: r13777 original commit: 85de5f27bfdf2b5d22b0a0f0b3062bbda8ce7618
svn: r13105 original commit: d1a0086471bf5e9553a9b056b26286c427831d38
original commit: c7b51cfd2d1dece6ac2254f44e278f3c18ee13a7