ensure new events' subtype is still maintained
Merge remote branch 'origin/master' into build
fix patch
Merge remote branch 'origin/master' into build
updated with event subtypes