Merge "Add rule validations"