Merge format from the trunk. This should fix the regressions resulting from the partial merge in [63640].