Merge branch 'eventscripts' into tests