ENG-6884: more comments