merge TvE's experimental fork