merge svn r5224 to git