Migrated to common-constraints 0.6.0