CS edits for EZP-20576