US5966: Another fix to RC E2E Prod tests
Merge branch 'master' into us5975