For ENG-3569, tweak comments