Complete consolidation [#389]