Modifications for June 12 E2E changes