Merge change 22483 into eclair

* changes:
  make the data version trigger happen before the update