Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e' * commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e': Add watermark support.
Merge commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e' * commit '9185e26a8f06dd7013a528ffa2fe6b3f4aa58b7e': Add watermark support.