BS-10363, replace rules by constraints