Merge commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb' * commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb': More watermark work.
Merge commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb' * commit '6e549d1c99ac41e44f30c8408f4b5382a0d281cb': More watermark work.