Merge svn changes up to r28862