Cherry-pick release 8.4.2 back to main#13698

nicoddemus merged 1 commit intopytest-dev:mainpytest-dev/pytest:mainfrom

nicoddemus:cherry-pick-releasenicoddemus/pytest:cherry-pick-releaseCopy head branch name to clipboard