svn: r6261 original commit: 127dd66e308a9e504650ed2c6c4a413be20090d9
svn: r6248 original commit: 1df44725567621dfc64bdd14de426f8d23d91eaf