Update from svn r44413 to r44701