Merge "adapt csit to integration, update the configurations"