Reflect changes by scripts/prepare_delivery.sh. Note: some additional files...

Reflect changes by scripts/prepare_delivery.sh. Note: some additional files kept for CI tests to run