Merge "Fix bug in validate() in BooleanConstraint"