ICC-5 resolving CR issues