Merge "fix csit appc"