For ENG-5498, add comments based on feedback