Merge change 25954 into eclair

* changes:
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.