Merge branch 'initevent'