Migrated to common-constraints 0.7.0