Merge "Finalize CSIT script regardless of setup success"