Merge changes from EVTV version