ENG-7040 address review concerns