DB/SAI: SAI for some of the trash in ICC Closes #8773