ENG-7068 code review changes