Issue #3329051 by Anybody, david.qdoscc: cookies_update_8007 fails when deploying to higher environments


(cherry picked from commit 8b38dfe5)