Auto backport of pr 26186 on v3.7.x#26214

QuLogic merged 2 commits intomatplotlib:v3.7.xmatplotlib/matplotlib:v3.7.xfrom

tacaswell:auto-backport-of-pr-26186-on-v3.7.xtacaswell/matplotlib:auto-backport-of-pr-26186-on-v3.7.xCopy head branch name to clipboard