Merge "[DCAEGEN2] Update son-handler CSIT with CPS"