on branch 1.4.x: follow up to #45450 and #45120 manual backports#45511

jreback merged 2 commits intopandas-dev:1.4.xpandas-dev/pandas:1.4.xfrom

simonjayhawkins:follow-up-2simonjayhawkins/pandas:follow-up-2Copy head branch name to clipboard