Merge in iaq changes