Level Event generation fixed
Merge commit 'f9f946592ed3dee749164de2226fc03fa2dcc461'