svn: r8774 original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f
original commit: 1bd92c441435a2c2ae5f0a37c7d5e6559e620360
original commit: 6fa4a2f4674a89f38760bceacd0420aad6a57d6c