Merge branch 't/writer_cleanups'