Completely finished UPDATE fixing with triggers.
Merge remote-tracking branch 'origin/master'