Following up on HV-808 we should create dedicated @Mod10Check and @Mod11Check constraints which will supersede @ModCheck.