Universal watermark (34/35)

Universal watermark