Merge head r258543 through r276056.