Merge svn r30174