Merge "Show diff column for fields only if diff is enabled."