BZ-12239 fixed watermark
Merge branch 'origin/master'