Resolve #3534708 "Fix failing tests"

Jeroen Tubexrequested to merge
issue/language_cookie-3534708:3534708-fix-failing-tests into 2.0.x

Closes #3534708

Merge request reports