diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java
index db10a848f00d5090241a5ed6fb7b26ae0f39b156..ba4489c3ee8edf8c30cfcfd201a6aa69ce90ca01 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/migration/SqlMigrationTestAbstract.java
@@ -42,7 +42,7 @@ import ch.systemsx.cisd.dbmigration.postgresql.DumpPreparator;
 public abstract class SqlMigrationTestAbstract
 {
 
-    private static final int CHECK_NUMBER_OF_MIGRATIONS = 4;
+    private static final int CHECK_NUMBER_OF_MIGRATIONS = 30;
 
     private File sqlScriptOutputDirectory;
 
diff --git a/openbis/source/sql/postgresql/migration/migration-095-096.sql b/openbis/source/sql/postgresql/migration/migration-095-096.sql
index 53dbd065cf027050770b4e5aa859ddabbec14cf3..d7b34105f4f12b37e085ae0e7621e77e0e33385a 100644
--- a/openbis/source/sql/postgresql/migration/migration-095-096.sql
+++ b/openbis/source/sql/postgresql/migration/migration-095-096.sql
@@ -4,8 +4,8 @@ alter table material_properties_history add column vocabulary_term identifier;
 alter table material_properties_history add column material identifier;
 update material_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
 update material_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table material_properties_history drop column cvte_id;
-alter table material_properties_history drop column mate_prop_id;
+alter table material_properties_history drop column cvte_id cascade;
+alter table material_properties_history drop column mate_prop_id cascade;
 ALTER TABLE MATERIAL_PROPERTIES_HISTORY ADD CONSTRAINT MAPRH_CK CHECK 
 	((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR 
 	 (VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR
@@ -16,8 +16,8 @@ alter table experiment_properties_history add column vocabulary_term identifier;
 alter table experiment_properties_history add column material identifier;
 update experiment_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
 update experiment_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table experiment_properties_history drop column cvte_id;
-alter table experiment_properties_history drop column mate_prop_id;
+alter table experiment_properties_history drop column cvte_id cascade;
+alter table experiment_properties_history drop column mate_prop_id cascade;
 ALTER TABLE EXPERIMENT_PROPERTIES_HISTORY ADD CONSTRAINT EXPRH_CK CHECK 
 	((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR 
 	 (VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR
@@ -28,8 +28,8 @@ alter table sample_properties_history add column vocabulary_term identifier;
 alter table sample_properties_history add column material identifier;
 update sample_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
 update sample_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table sample_properties_history drop column cvte_id;
-alter table sample_properties_history drop column mate_prop_id;
+alter table sample_properties_history drop column cvte_id cascade;
+alter table sample_properties_history drop column mate_prop_id cascade;
 ALTER TABLE SAMPLE_PROPERTIES_HISTORY ADD CONSTRAINT SAPRH_CK CHECK 
 	((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR 
 	 (VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR
@@ -40,8 +40,8 @@ alter table data_set_properties_history add column vocabulary_term identifier;
 alter table data_set_properties_history add column material identifier;
 update data_set_properties_history set vocabulary_term = (select (t.code || ' [' || v.code || ']') from controlled_vocabulary_terms as t join controlled_vocabularies as v on t.covo_id = v.id where t.id = cvte_id) where cvte_id is not null;
 update data_set_properties_history set material = (select (m.code || ' [' || mt.code || ']') from materials as m join material_types as mt on m.maty_id = mt.id where m.id = mate_prop_id) where mate_prop_id is not null;
-alter table data_set_properties_history drop column cvte_id;
-alter table data_set_properties_history drop column mate_prop_id;
+alter table data_set_properties_history drop column cvte_id cascade;
+alter table data_set_properties_history drop column mate_prop_id cascade;
 ALTER TABLE DATA_SET_PROPERTIES_HISTORY ADD CONSTRAINT DSPRH_CK CHECK 
 	((VALUE IS NOT NULL AND VOCABULARY_TERM IS NULL AND MATERIAL IS NULL) OR 
 	 (VALUE IS NULL AND VOCABULARY_TERM IS NOT NULL AND MATERIAL IS NULL) OR