Refactor Publisher (needs more work to reduce I/O)
Merge remote-tracking branch 'upstream/master'