[OE-3915] Fix discrepancies in consolidation migration.
Merge branch 'master' into develop