svn: r8774 original commit: b1a08edd5a8c0db0bae4a9e052d9a93d1faabb4f
original commit: c3eb3402545c5e15c214ce09f51cd1a36e6accc0