Merge pull request #24 from riscv/dev/kbroch/draft-watermark

Merge pull request #24 from riscv/dev/kbroch/draft-watermark #37