svn: r6714 original commit: 7de23b6373ac5d88c54350a847a41bedd3516a2d
svn: r6248 original commit: 1df44725567621dfc64bdd14de426f8d23d91eaf