Merge branch 'ns/batch-fsync'