Constraint Manager validation is updated to match the latest changes on core