Backport PR #24157 on branch v3.6.x (test only PR milestoning guidance)#24186

timhoffm merged 2 commits intomatplotlib:v3.6.xmatplotlib/matplotlib:v3.6.xfrom

meeseeksmachine:auto-backport-of-pr-24157-on-v3.6.xmeeseeksmachine/matplotlib:auto-backport-of-pr-24157-on-v3.6.xCopy head branch name to clipboard