[544165] Accommodate multiple CMEs
2 files changed