Manual backport 160db5b from PR #58835#58847

jscheffl merged 1 commit intoapache:v3-1-testapache/airflow:v3-1-testfrom

jscheffl:backport-160db5b-v3-1-testjscheffl/airflow:backport-160db5b-v3-1-testCopy head branch name to clipboard