svn: r8196 original commit: 7fc41024c0f09d03bed22c9e68bc2548f9222b77
svn: r7706 original commit: 39cedb62edf9258b051a22a29a90be9c6841956f