[PATCH 11/17] Updated mappings of AC-8*