Bug 13457 - Followup for CPL and S codes