MC ≥1.11 support