Merge "Add csit for multi-fcaps"