Porting cybr's EMF+VEvents updates to 3.0-beta