svn: r8786 original commit: bb34f747b60bb4b06e0c2098e9c591677fb49d57
svn: r8774 original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f
original commit: d8b0020014998b40e9d3bf9bdf772445b7951aef