Merge "[CPS] Remove duplicate configuration"