edit event
Merging from upstream with edit changes