IA sync with IIPC

Bringing this change in from IA.