Try having EliRefresh/event-changes as upstream, merge changes