Merge branch 'main' into fix_delivery_script