[OE-3603] Fix consolidation on existing database