Merge "[CPS] Add topics and parameters"