Merge branch 'format-memory-rework'