Manage case where event attrs is empty
Merge branch 'master' into dev_lwk4