Merge from iipc master into IA master