upd insert and update event
Merge remote-tracking branch 'upstream/master'