Merge "Add package update and remove as generic atom events"