Merge branch 'mz/packwriter'