Merge "Update CSIT for nonrtric"