Merge branch 'main' into cleanup_prepare_delivery