[DEV-165] Add high water mark (hwm)