Merge change 23579 into eclair

* changes:
  Bulk change of columns, LAST TIME.