[PATCH 0/2] additional CCI/SRG mapping updates