CS Edits for EZP-20576 changes