svn: r3764 original commit: 6f4093f152daf195979e1f900b72f9e9fdfcc270
svn: r3763 original commit: 3cf662e760d8af975999f90011687c2346867c85