Merge branch 'main' into 2024-11-22_driver_prep