[PATCH 15/17] Added mappings against AC-17*