Mariniss bug 423516 refactor watchservice