Merge head r258543 through r271639.