Merge pull request #8703 from dstftw/mark-watched