Merge branch 'main' into dev_prepare_delivery_script__20230811