Merge "Test configuration updates in CSITs"