11243 cherry picks#11253

bluetech merged 2 commits intopytest-dev:mainpytest-dev/pytest:mainfrom

bluetech:11243-cherry-picksbluetech/pytest:11243-cherry-picksCopy head branch name to clipboard