Adding in better watermark
Merge branch 'develop' into dev.643
Reworked watermark on non-vested archives. fixes #643