Anja Istenič

Thanks @ChrisFraun for reconciling our 2 PRs into one (https://github.com/apache/airflow/pull/25985 and this one). These changes look good to me 👍

@georgeyord Not sure what the merge process is but any review or feedback would be much appreciated.