Merge "Add validations for rule sub-components"