svn: r8774 original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f
original commit: d4ceb4deb8b575a02cc0f64ed60f2cd31026f236
original commit: 94f51dda132c327d307d686b814482b8ec78c6a4