Merge pull request #6892 from illume/upstream-0042-graphview-crd-watch