Merge head r258543 through r274419.