Merge "Add CSIT job for SO"