Merge "Bug 2362 - Milestone: Basic constraints validation"