[OE-3915] Fix discrepancies in consolidation migration.
Merge branch 'release/1.5' into feature/table-versioning