Merge branch 't/write_consolidation'