Merge branch 'writeback-plugging'