Updating constraints classes to offer more flexibility on rules that can be parsed.
Merge remote-tracking branch 'upstream/development' into development