Merge svn changes up to r26783