[PATCH 19/20] Mapped CM-9