Merge "[TECHDEBT] Align CPS Core REST API Specification and Implementation"