Merge branch 'main' into 915-improvements-to-prepare_delivery-sh