Added high-water-mark option
branch merge