svn: r8481 original commit: 7e6ef8eeb5bbd071ac41675fdd23246b928eedac
svn: r8196 original commit: 7fc41024c0f09d03bed22c9e68bc2548f9222b77