svn: r7965 original commit: 622cd0554d57fc1c5f1dc03c69504703181eec18
svn: r7706 original commit: 39cedb62edf9258b051a22a29a90be9c6841956f