ENG-5741: some comments.