Merge change 8179 into donut

* changes:
  Fix SQL generated by updateWithOnConflict()