Fix performance problems with E2E dataplane
3 files changed