Merge "[CPS] Security logging fields"