svn: r8774 original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f
original commit: 4abfb7bb4762e626832223ca542274620c6d0cfd