Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"