US5966: Fix RC E2E prod test failure
Merge branch 'master' into us5975