Merge "E2T: Multi e2term instances"