ENG-6023: comments and watch shouldContinue