First run at labeling constraints
Merge branch 'feature-constraint-naming'