Merge change 26096 into eclair

* changes:
  Try to do an update before inserting.