[PATCH 00/26] More CCI Mappings