fix shutdown event

Merged Alexandre Vincent requested to merge shutdown-fix into master

Merge request reports