Add event FINISH
Merge remote-tracking branch 'origin/maya'