680f955
Missing backport of commit f652402 for buffered dataset Again, should not be forwardported
f652402