backport/deterministic-e2e