Merge main
into datafusion-sql-planner
#654
Merged
main
into datafusion-sql-planner
#654