ENG-5072: comments