Merge "Start ICS header cleanup and finish type matrix."