merge 0.4.9 event changes

only event changes, don't merge the extra "features"